Orchestrator Git Standards Skill

CRITICAL: Follow Orchestrator AI Git standards: conventional branch names, conventional commits, clean history.

When to Use This Skill

Use this skill when:

• Creating branches
• Making commits
• Organizing git workflow
• Following project Git standards

Branch Naming Standards

✅ CORRECT

bash
1feature/user-authentication
2feature/add-api-endpoint
3fix/login-bug
4fix/memory-leak
5chore/update-dependencies
6chore/refactor-service
7docs/update-readme
8test/add-unit-tests
9refactor/auth-service

❌ WRONG

bash
1❌ my-feature
2❌ bugfix
3❌ update
4❌ feature_branch
5❌ FEATURE-BRANCH
6❌ feature/user authentication (spaces)

Commit Message Standards

See Conventional Commits Skill for complete format. Quick reference:

bash
1# Format
2<type>(<scope>): <description>
3
4# Examples
5feat(auth): add user authentication
6fix(api): resolve memory leak
7chore(deps): update dependencies
8docs(readme): update installation guide
9test(auth): add unit tests for auth service
10refactor(api): restructure service layer

Git Workflow Pattern

1. Create Branch

bash
1# From main
2git checkout main
3git pull
4
5# Create feature branch
6git checkout -b feature/user-authentication

2. Make Changes

bash
1# Edit files
2vim apps/api/src/auth/auth.service.ts
3
4# Stage changes
5git add .
6
7# Commit with conventional format
8git commit -m "feat(auth): add user authentication service"

3. Push and PR

bash
1# Push branch
2git push origin feature/user-authentication
3
4# Open PR on GitHub
5# Follow PR process (see GitHub Workflow Skill)

4. Update Branch

bash
1# If main has new commits
2git checkout main
3git pull
4git checkout feature/user-authentication
5git rebase main  # or git merge main

Commit Types

Scope Guidelines

Scopes should match affected areas:

bash
1# API scopes
2feat(api): add endpoint
3fix(api): resolve bug
4
5# Module scopes
6feat(auth): add authentication
7fix(llm): resolve provider issue
8
9# Feature scopes
10feat(agents): add new agent type
11fix(webhooks): resolve status tracking

Git History Best Practices

✅ DO

• Keep commits focused (one logical change per commit)
• Use descriptive commit messages
• Write clear commit descriptions
• Rebase before PR (clean history)
• Squash commits in PR if needed

❌ DON'T

• Don't commit unrelated changes together
• Don't use vague commit messages
• Don't force push to shared branches
• Don't commit broken code
• Don't commit secrets or credentials

Commit Message Examples

✅ Good Commit Messages

bash
1feat(auth): add JWT token authentication
2
3- Implement JWT token generation
4- Add token validation middleware
5- Update auth service with token logic
6
7fix(api): resolve memory leak in service
8
9The service was holding references to completed requests.
10Now properly cleans up after request completion.
11
12chore(deps): update NestJS to v10
13
14- Update @nestjs/core to 10.0.0
15- Update @nestjs/common to 10.0.0
16- Resolve breaking changes

❌ Bad Commit Messages

bash
1❌ fix stuff
2❌ update
3❌ changes
4❌ WIP
5❌ asdf
6❌ fixed bug

Branch Organization

Main Branches

• main - Production-ready code
• develop - Integration branch (if used)

Feature Branches

bash
1feature/<feature-name>
2# Examples:
3feature/user-authentication
4feature/add-metrics-dashboard

Fix Branches

bash
1fix/<fix-name>
2# Examples:
3fix/login-error
4fix/memory-leak

Chore Branches

bash
1chore/<chore-name>
2# Examples:
3chore/update-dependencies
4chore/refactor-service-layer

Git Commands Reference

Common Commands

bash
1# Create branch
2git checkout -b feature/my-feature
3
4# Stage changes
5git add .
6
7# Commit
8git commit -m "feat(module): description"
9
10# Push
11git push origin feature/my-feature
12
13# Update from main
14git checkout main
15git pull
16git checkout feature/my-feature
17git rebase main
18
19# View status
20git status
21
22# View log
23git log --oneline
24
25# View changes
26git diff

Repository Organization

Directory Structure

orchestrator-ai/
├── apps/
│   ├── api/          # NestJS backend
│   ├── web/          # Vue frontend
│   └── n8n/          # N8N workflows
├── storage/          # Database snapshots
├── scripts/          # Utility scripts
└── .github/          # GitHub workflows

Ignore Patterns

.gitignore should include:

• node_modules/
• .env
• dist/
• *.log
• .DS_Store

Checklist for Git Standards

When working with Git:

• Branch name follows convention (feature/, fix/, etc.)
• Commit message follows conventional format
• Commit is focused (one logical change)
• Commit message is descriptive
• No secrets or credentials committed
• Code quality gates pass before commit
• Git history is clean (rebase if needed)

Related Documentation

• Conventional Commits: See Conventional Commits Skill
• GitHub Workflow: See GitHub Workflow Skill
• Quality Gates: See Quality Gates Skill
• Worktree Lifecycle: See Worktree Lifecycle Skill